From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Tue, 23 Feb 2010 00:35:03 +0000 (-0500)
Subject: Don't generate st.h in a subdir
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10404
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ce6dd21cd359c243203429c907bfe7808c9d84ac;p=gnome-shell.git

Don't generate st.h in a subdir

For srcdir != builddir, in the builddir, the st/ subdirectory doesn't
exist, so we can't generate st.h there. Just switch to building st.h
directly in the current directory. (The other option would be to
create a st/ subdirectory in the builddir if necessary; might be a
little cleaner, but this works for now and gets things distchecking.)
---

diff --git a/.gitignore b/.gitignore
index 9cbae4b7f..527a7361d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ src/gnome-shell
 src/test-recorder
 src/test-recorder.ogg
 src/test-theme
-src/st/st.h
+src/st.h
 stamp-h1
 tests/run-test.sh
 xmldocs.make
diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 2e6ea136b..51593e240 100644
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -97,14 +97,14 @@ st_source_h =					\
     st/st-types.h				\
     st/st-widget.h				\
     $(NULL)
-    
-st/st.h: Makefile
+
+st.h: Makefile
 	$(AM_V_GEN) (echo "#define ST_H_INSIDE 1";	\
 	for name in $(st_source_h); do			\
 	  echo "#include <"$$name">";			\
-	done; echo "#undef ST_H_INSIDE") > st/st.h.tmp && mv st/st.h.tmp st/st.h
+	done; echo "#undef ST_H_INSIDE") > st.h.tmp && mv st.h.tmp st.h
 
-BUILT_SOURCES += st/st.h
+BUILT_SOURCES += st.h
 
 st_source_private_h =				\
     st/st-private.h				\
@@ -152,7 +152,7 @@ libst_1_0_la_SOURCES =				\
     $(st_source_private_h)			\
     $(st_source_private_c)			\
     $(st_source_h)				\
-    st/st.h					\
+    st.h					\
     $(st_built_sources)				\
     $(NULL)
 libst_1_0_la_CPPFLAGS = $(st_cflags)
diff --git a/src/shell-slicer.h b/src/shell-slicer.h
index 29c44bb19..1276ca252 100644
--- a/src/shell-slicer.h
+++ b/src/shell-slicer.h
@@ -2,7 +2,7 @@
 #ifndef __SHELL_SLICER_H__
 #define __SHELL_SLICER_H__
 
-#include "st/st.h"
+#include "st.h"
 
 #define SHELL_TYPE_SLICER                 (shell_slicer_get_type ())
 #define SHELL_SLICER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_SLICER, ShellSlicer))